Protect against stop_load begin broken. (#403255, Lucas Mazzardo Veloso)

2007-02-06  Matthias Clasen  <mclasen@redhat.com>

        * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Protect
        against stop_load begin broken.  (#403255, Lucas Mazzardo Veloso)

svn path=/trunk/; revision=17267

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 8cc0e7101898818e3f588caac7b58551ca686a88..08dc7f77a60ac1d7edcc3324c1b0756d9fb151c4 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Protect
+       against stop_load begin broken.  (#403255, Lucas Mazzardo Veloso)
+
 2007-01-21  Matthias Clasen  <mclasen@redhat.com>
 
        * io-gif.c (gdk_pixbuf__gif_image_stop_load): Return an

diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index c8c985229232b45a062d7f0f5b4419d8c5e2294d..12f8986da48d46eaae0d7da6c9173de941302e71 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -711,8 +711,10 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
 
         if (priv->image_module && priv->image_module->stop_load && priv->context) 
                 {
-                        if (!priv->image_module->stop_load (priv->context, error))
+                        GError *tmp = NULL;
+                        if (!priv->image_module->stop_load (priv->context, &tmp) || tmp)
                                 {
+                                       g_propagate_error (error, tmp);
                                         gdk_pixbuf_loader_ensure_error (loader, error);
                                         retval = FALSE;
                                 }